Starting with Qt 5.5, the default rpath handling changed. Add -Wl,-rpath

bits to our ld invocation as suggested at
http://lists.qt-project.org/pipermail/development/2015-September/023299.html

diff --git a/configure b/configure
index b86235bc3b8968db15df9ddb0a9784cf98182a51..aaba6f59b27f1b0c3c55f33fa1c24e9abe47ab17 100755 (executable)
--- a/configure
+++ b/configure
@@ -4825,7 +4825,7 @@ rm -f core conftest.err conftest.$ac_objext \
       if test $QT_FW_OR_LIBS = "**Unknown**" ; then
          QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
       fi
-      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+      QT_LIBS="-Wl,-rpath, $QT_FW_OR_LIBS -F$QT_FW_OR_LIBS -framework QtCore"
       QT_INC="$QT_FW_OR_LIBS"
       QT_INC_OPT="-F"
       QT_SYSINC_OPT="-iframework"

diff --git a/configure.in b/configure.in
index d8fd5d4e321b4ebfc6669c51f7efdcf216094c04..09059f4bd581c6ba33eccd55251c4958db566db1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -224,7 +224,7 @@ case "$target" in
       if test $QT_FW_OR_LIBS = "**Unknown**" ; then
          QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
       fi
-      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+      QT_LIBS="-Wl,-rpath, $QT_FW_OR_LIBS -F$QT_FW_OR_LIBS -framework QtCore"
       QT_INC="$QT_FW_OR_LIBS"
       QT_INC_OPT="-F"
       QT_SYSINC_OPT="-iframework"